Skip to content

Commit

Permalink
7.3 (fix #7)
Browse files Browse the repository at this point in the history
  • Loading branch information
MC-datapack committed Jan 19, 2025
1 parent 2c62bac commit ef130d5
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2025-01-19T11:39:11.777797 More Tools and Armor/Model Definitions
// 1.21.1 2025-01-19T19:56:47.7636235 More Tools and Armor/Model Definitions
bfadc3cbf1da8708fce07c45325e927983065a2c assets\more_tools_and_armor\models\item\copper_paxel.json
55d0901fb474b34e53b47fd858dfec2208eb7beb assets\more_tools_and_armor\models\item\deepslate_emerald_leggings.json
d5b73932607cd6421fab7ddd52bdbd8561660400 assets\more_tools_and_armor\models\item\golden_paxel.json
Expand Down Expand Up @@ -114,8 +114,8 @@ e77831b144e9ba05d5150f7b5d14724f2d37a04e assets\more_tools_and_armor\models\bloc
ca99b000d1b14bb9a522f88f263009ab1dabeba2 assets\more_tools_and_armor\models\item\void_sword.json
9544332c698958f6a803928a9bacd2acb203f27d assets\more_tools_and_armor\models\block\end_diamond_block.json
8c312555bc7ee4f040a3b079f7d4059f288979ba assets\more_tools_and_armor\models\item\onethdenderite_ingot.json
7e8ef1faa3dd8f93dbc2fd5ec48995650ed59b1b assets\more_tools_and_armor\models\item\budding_amethyst_chestplate.json
63edd200662a3387fb3388ba69cf0f9401aacd34 assets\more_tools_and_armor\models\item\end_diamond_chestplate.json
7e8ef1faa3dd8f93dbc2fd5ec48995650ed59b1b assets\more_tools_and_armor\models\item\budding_amethyst_chestplate.json
4ca8b852393b853db36f906f846e5d5ae52f76f0 assets\more_tools_and_armor\models\item\void_helmet.json
1158428a3fe5ef68997822002441ddd3af3dd154 assets\more_tools_and_armor\blockstates\blackstone_emerald_ore.json
bf1fe3c3db13111e4e594499b4c31cabd6d76bfe assets\more_tools_and_armor\models\item\oled_hoe.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2025-01-19T11:39:11.7787964 More Tools and Armor/World Generator
// 1.21.1 2025-01-19T19:56:47.7646236 More Tools and Armor/World Generator
ba4a3d02660a4b35609467e66050316855075971 data\more_tools_and_armor\worldgen\configured_feature\end_diamond_ore.json
2e3896c37dac17b5e03a8c033309e0f62c7ce5a5 data\more_tools_and_armor\worldgen\placed_feature\end_iron_ore.json
3cafae5754ee15fcf3db661feebde3439b35bd71 data\more_tools_and_armor\worldgen\placed_feature\end_lapis_lazuli_ore.json
Expand All @@ -8,9 +8,9 @@ ba4a3d02660a4b35609467e66050316855075971 data\more_tools_and_armor\worldgen\conf
83cad043608778457e26ea0224fa10c2ebdd0110 data\more_tools_and_armor\worldgen\configured_feature\blackstone_emerald_ore.json
b2ff528f5dbd7b529f3ce1ef51092cfb5d3c997b data\more_tools_and_armor\worldgen\placed_feature\end_coal_ore.json
77ef71f2b91096f2705bef27689ebee713949c01 data\more_tools_and_armor\worldgen\placed_feature\end_diamond_ore.json
e513b48c685d5ba9a3dc9806604010a94db62284 data\more_tools_and_armor\worldgen\placed_feature\sculk_emerald_ore.json
b3ed81a59041b7c691813bf668dd6108ac70fdec data\more_tools_and_armor\worldgen\placed_feature\end_redstone_ore.json
b7da8e0186661e5195f99de07ddd9b1668031301 data\more_tools_and_armor\worldgen\placed_feature\end_gold_ore.json
b3ed81a59041b7c691813bf668dd6108ac70fdec data\more_tools_and_armor\worldgen\placed_feature\end_redstone_ore.json
e513b48c685d5ba9a3dc9806604010a94db62284 data\more_tools_and_armor\worldgen\placed_feature\sculk_emerald_ore.json
e2422cb3c0faa69ad47428ae006862b276221860 data\more_tools_and_armor\worldgen\configured_feature\end_redstone_ore.json
24f0fad0871f4047bf76962af0a7d04e8a2490f8 data\more_tools_and_armor\worldgen\placed_feature\end_emerald_ore.json
b800f10b3e031ba100daad42b389a597bb291f71 data\more_tools_and_armor\worldgen\configured_feature\sculk_emerald_ore.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2025-01-19T11:39:11.7787964 More Tools and Armor/Tags for minecraft:item
// 1.21.1 2025-01-19T19:56:47.765623 More Tools and Armor/Tags for minecraft:item
009937ca4540f639f0ddb674a89445d2694f6d24 data\minecraft\tags\item\axes.json
82bb69039e14eec62f6a5c18e4b5d98e945104dc data\minecraft\tags\item\chest_armor.json
8fd2e586820f6ef5060bf1b84783fe571754000c data\minecraft\tags\item\leg_armor.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2025-01-19T11:39:11.7727967 More Tools and Armor/Tags for minecraft:block
// 1.21.1 2025-01-19T19:56:47.7596242 More Tools and Armor/Tags for minecraft:block
d87bd540822fe6fe9b31edfc7f285021b5d5d83c data\more_tools_and_armor\tags\block\needs_deepslate_emerald_tool.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\more_tools_and_armor\tags\block\incorrect_for_end_diamond_tool.json
f2ade6868691dd545f2e305d3efccbc2f55ae809 data\minecraft\tags\block\incorrect_for_stone_tool.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2025-01-19T11:39:11.7737965 More Tools and Armor/Recipes
// 1.21.1 2025-01-19T19:56:47.761623 More Tools and Armor/Recipes
44119db4e4161fe83a0f9455fbc3ca568341b1a2 data\more_tools_and_armor\advancement\recipes\tools\copper_boots.json
f8ab1c710b86eba9d5986ffb342a7189a33d13ad data\more_tools_and_armor\advancement\recipes\tools\obsidian_chestplate.json
ab433be35b0956b59af74bb8b07c109d4682898f data\more_tools_and_armor\advancement\recipes\tools\copper_helmet.json
Expand Down Expand Up @@ -66,7 +66,7 @@ a6107eb26b6ed75d4267580655188a5ff83cba9d data\more_tools_and_armor\recipe\buddin
d1777d02449445fe29cceac4972d1071f298cdee data\more_tools_and_armor\recipe\end_diamond.json
f077b35bf6129e88bba3d7057f50bf9b260b0938 data\more_tools_and_armor\recipe\blackstone_emerald.json
53d8ff0618ca6c4194b676de9aa996649681ef1b data\more_tools_and_armor\recipe\golden_paxel.json
bf893a28c7fb7d71ec8060c06c60109e8a257fee data\more_tools_and_armor\recipe\end_diamond_paxel_upgrade.json
1974c11bfcde52be59cf456fe32e0aea459919d7 data\more_tools_and_armor\recipe\end_diamond_paxel_upgrade.json
704c9111855761bedef9fbc9a90738b9034e1177 data\more_tools_and_armor\advancement\recipes\tools\oled_paxel.json
0aafdd028f39372167a7b574440b91e0c7a0eec9 data\more_tools_and_armor\advancement\recipes\misc\end_emerald.json
e3b1cd55255e33c7c84e5d4d50d75f9535b03d8c data\more_tools_and_armor\advancement\recipes\misc\deepslate_emerald_upgrade_smithing_template_dupe.json
Expand Down Expand Up @@ -136,8 +136,8 @@ f453b3ccdfcc58a99be1b604ecf1c07868a3e16f data\more_tools_and_armor\recipe\sculk_
fbb202256fae63c9f33ba794acc08f07d598044f data\more_tools_and_armor\advancement\recipes\tools\budding_amethyst_pickaxe.json
6298d4db83791225fc6b1dc05c656df6c9822556 data\more_tools_and_armor\advancement\recipes\tools\obsidian_helmet.json
a9e654e568aeae3227c72e9640ef445ca777ba13 data\more_tools_and_armor\recipe\deepslate_emerald.json
d7282b56a396b09ee652b827c308889c50eb76cd data\more_tools_and_armor\advancement\recipes\tools\oled_paxel_upgrade.json
b9242d33e70ab6cfc1e6c8d3a050d9c047fd472e data\more_tools_and_armor\recipe\onethdenderite_paxel_upgrade.json
d7282b56a396b09ee652b827c308889c50eb76cd data\more_tools_and_armor\advancement\recipes\tools\oled_paxel_upgrade.json
c2b2a19d4c4348e4712f93936f3e263d145314d4 data\more_tools_and_armor\advancement\recipes\tools\copper_sword.json
9a9ae143a3ec13f4758775d5b420b2afbec10898 data\more_tools_and_armor\advancement\recipes\tools\emerald_paxel.json
979be28e6a432f0df539eefc8dd47f4d9fb17ef5 data\more_tools_and_armor\advancement\recipes\misc\onethdenderite_upgrade_smithing_template.json
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"item": "more_tools_and_armor:end_diamond"
},
"base": {
"item": "more_tools_and_armor:deepslate_emerald_upgrade_smithing_template"
"item": "more_tools_and_armor:deepslate_emerald_paxel"
},
"result": {
"count": 1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ public void generate(RecipeExporter exporter) {

paxelUpgradeRecipe(NETHERITE_UPGRADE_SMITHING_TEMPLATE, DIAMOND_PAXEL, NETHERITE_INGOT, NETHERITE_PAXEL, exporter);
paxelUpgradeRecipe(DEEPSLATE_EMERALD_UPGRADE_SMITHING_TEMPLATE, NETHERITE_PAXEL, DEEPSLATE_EMERALD, DEEPSLATE_EMERALD_PAXEL, exporter);
paxelUpgradeRecipe(END_DIAMOND_UPGRADE_SMITHING_TEMPLATE, DEEPSLATE_EMERALD_UPGRADE_SMITHING_TEMPLATE, END_DIAMOND, END_DIAMOND_PAXEL, exporter);
paxelUpgradeRecipe(END_DIAMOND_UPGRADE_SMITHING_TEMPLATE, DEEPSLATE_EMERALD_PAXEL, END_DIAMOND, END_DIAMOND_PAXEL, exporter);
paxelUpgradeRecipe(VOID_UPGRADE_SMITHING_TEMPLATE, END_DIAMOND_PAXEL, VOID_INGOT, VOID_PAXEL, exporter);
paxelUpgradeRecipe(ONETHDENDERITE_UPGRADE_SMITHING_TEMPLATE, VOID_PAXEL, ONETHDENDERITE_INGOT, ONETHDENDERITE_PAXEL, exporter);
paxelUpgradeRecipe(OLED_UPGRADE_SMITHING_TEMPLATE, ONETHDENDERITE_PAXEL, OLED_INGOT, OLED_PAXEL, exporter);
Expand Down

0 comments on commit ef130d5

Please sign in to comment.