From 7a84f77e30943bdf3201917b4f86a82e87499bc6 Mon Sep 17 00:00:00 2001 From: P3pp3rF1y Date: Tue, 6 Feb 2024 23:41:01 +0100 Subject: [PATCH] =?UTF-8?q?feat:=20=E2=9C=A8=20Add=20Stack=20Upgrader=20St?= =?UTF-8?q?arter=20Tier=20crafted=20with=20copper=20blocks=20and=20can=20b?= =?UTF-8?q?e=20crafted=20into=20tier=201=20with=20fewer=20iron=20blocks=20?= =?UTF-8?q?needed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 +- .../misc/stack_upgrade_starter_tier.json | 35 ++++++++++++++++++ .../stack_upgrade_tier_1_from_starter.json | 35 ++++++++++++++++++ .../recipes/stack_upgrade_starter_tier.json | 25 +++++++++++++ .../stack_upgrade_tier_1_from_starter.json | 25 +++++++++++++ .../data/SBPRecipeProvider.java | 24 +++++++++--- .../sophisticatedbackpacks/init/ModItems.java | 10 ++--- .../sophisticatedbackpacks/lang/en_us.json | 2 + .../item/stack_upgrade_starter_tier.json | 6 +++ .../item/stack_upgrade_starter_tier.png | Bin 0 -> 260 bytes .../textures/item/stack_upgrade_tier_1.png | Bin 1287 -> 231 bytes 11 files changed, 153 insertions(+), 13 deletions(-) create mode 100644 src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/stack_upgrade_starter_tier.json create mode 100644 src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/stack_upgrade_tier_1_from_starter.json create mode 100644 src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_starter_tier.json create mode 100644 src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_1_from_starter.json create mode 100644 src/main/resources/assets/sophisticatedbackpacks/models/item/stack_upgrade_starter_tier.json create mode 100644 src/main/resources/assets/sophisticatedbackpacks/textures/item/stack_upgrade_starter_tier.png diff --git a/gradle.properties b/gradle.properties index 932d9f17..a62865c2 100644 --- a/gradle.properties +++ b/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 \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/stack_upgrade_starter_tier.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/stack_upgrade_starter_tier.json new file mode 100644 index 00000000..917d7532 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/stack_upgrade_tier_1_from_starter.json b/src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/stack_upgrade_tier_1_from_starter.json new file mode 100644 index 00000000..6d8220f3 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_starter_tier.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_starter_tier.json new file mode 100644 index 00000000..0e123f3d --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_1_from_starter.json b/src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_1_from_starter.json new file mode 100644 index 00000000..3b1ec648 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/data/SBPRecipeProvider.java b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/data/SBPRecipeProvider.java index efac9367..b24813ed 100644 --- a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/data/SBPRecipeProvider.java +++ b/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 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 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") diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/init/ModItems.java b/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/init/ModItems.java index b0a38d21..f39ba131 100644 --- a/src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/init/ModItems.java +++ b/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 CRAFTING_UPGRADE = ITEMS.register("crafting_upgrade", () -> new CraftingUpgradeItem(Config.SERVER.maxUpgradesPerStorage)); public static final RegistryObject STONECUTTER_UPGRADE = ITEMS.register("stonecutter_upgrade", () -> new StonecutterUpgradeItem(Config.SERVER.maxUpgradesPerStorage)); + public static final RegistryObject STACK_UPGRADE_STARTER_TIER = ITEMS.register("stack_upgrade_starter_tier", () -> + new StackUpgradeItem(1.5D, Config.SERVER.maxUpgradesPerStorage)); public static final RegistryObject STACK_UPGRADE_TIER_1 = ITEMS.register("stack_upgrade_tier_1", () -> new StackUpgradeItem(2, Config.SERVER.maxUpgradesPerStorage)); public static final RegistryObject STACK_UPGRADE_TIER_2 = ITEMS.register("stack_upgrade_tier_2", () -> diff --git a/src/main/resources/assets/sophisticatedbackpacks/lang/en_us.json b/src/main/resources/assets/sophisticatedbackpacks/lang/en_us.json index ec319880..0f078023 100644 --- a/src/main/resources/assets/sophisticatedbackpacks/lang/en_us.json +++ b/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", diff --git a/src/main/resources/assets/sophisticatedbackpacks/models/item/stack_upgrade_starter_tier.json b/src/main/resources/assets/sophisticatedbackpacks/models/item/stack_upgrade_starter_tier.json new file mode 100644 index 00000000..56809d17 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sophisticatedbackpacks/textures/item/stack_upgrade_starter_tier.png b/src/main/resources/assets/sophisticatedbackpacks/textures/item/stack_upgrade_starter_tier.png new file mode 100644 index 0000000000000000000000000000000000000000..3996ba758f4dc9a1b2c02585351b476166cd938b GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`r#)R9Lo7}wCoB*!FfuSOh*{nD zk6(C2^yb-(K%iKDEvxNh=0b@#%LKxAq^-TSw5NdCZ;rM9q_bjfZ9GwHy(J?ju$s2) z?7UR-_-(kwY|fiEUo7}@Ah+!k^Y)FW4u0A2VDrk$j#C$8&q!!&Ib9aBuHj{3NmdK II;Vst0G#V;2mk;8 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/sophisticatedbackpacks/textures/item/stack_upgrade_tier_1.png b/src/main/resources/assets/sophisticatedbackpacks/textures/item/stack_upgrade_tier_1.png index 6bc442206a4eebbe43487dc8c3ee511dcf53fbec..6141bf2cc28f94316a33eb1bf6ee2bf037f16179 100644 GIT binary patch delta 204 zcmV;-05kuG3g-ckBYyy{NklaB^>EX>4U6ba`-PAZ2)IW&i+q+O3vpvg0ZY zh5u_6y#ypNE(bGIy&b&e_W_gPW@;z7red%n3voUfo7(^Xb^3!tIC-)zM4!AjIBc>> zG6vD?$KJEC^Smz1Y4F2N=RX7{MX&p%Z_7W!?k+b3yX@OfJAZ|;;=~o`6nO>IF|%N> z{Nf6vvfFuGQ(E_Bd$pYP+v>8py}P}(0b*2#cq$}KSq;uIX3_Cu&FB?pR+w>ibDVHi zwU4!<^YBKz^XNu9lb2n8N%GR_+rGMN zJ(Tja7Ij+69Dl)agOoaN^JoD-hjExKp+zjQfLI014XqF-7O36Xa^=jO+w2P$q-do{ zKrd3jVA!GtNm6tmu%mI801TBhf>QxC@K8DD!gJm<=PMjBb7go6BN*e3yGD!UV8-HE&F~k^C%t?}B3vk??p)>Bz@W^?SO*gx_&2M3gTiS9#`4n4R z@gBmeJ@tI1wy6H3#y8|% zQ{zQ#5VO-ST&Teu!YKrg?ZgdcASRYUJPZOTXnz^ZOk`_ikQ>ZQ5p?0Ho)v#X*7q86|bi}?MAV#Io!6`1uH84fD;|^I^aZ4ykfa>x>~`-Rr7L*vD+f_ zy?@Mme;Ww=_erak@;I-)8Gjmb-5rW0ZQ0bgU*e@7KTU~l4JGVBJqo{j*)Qs*%@x#S zzURJFqdVD-q}OHLQN6Y>%{1+ZwJ$XRYI%11b+UI_(p!*UWJ@0dzsZk2gMH7M{;A?a zvF}Bt-#|aKq_@#O>B)Qq`(8_W6ZTUP>3?3i+#7vw?6&%XfZtxt{@PW0y2 z%hN9ox?91AJ$)^6$9HAI4*3@j7*A^tV+vdV000JJOGiWibN~PV0QC|5Z~y=R34d@% zS#tmY4#WTe4#WYKD-Ig~000McNliruWYm eZ-`=34FCWs@s8r?^jA*+0000