Skip to content

Commit

Permalink
Run datagen
Browse files Browse the repository at this point in the history
  • Loading branch information
IThundxr committed Nov 7, 2024
1 parent 4cb2c2c commit 9981084
Show file tree
Hide file tree
Showing 18 changed files with 23 additions and 23 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2024-11-07T10:32:15.786219 Create's Sequenced Assembly Recipes
// 1.19.2 2024-11-07T10:40:17.225681 Create's Sequenced Assembly Recipes
884fc364d6d332966eaccd28778f8c5097d19422 data/create/recipes/sequenced_assembly/sturdy_sheet.json
2d287e023d41b94bf9b2c446c01cd541132f1b60 data/create/recipes/sequenced_assembly/precision_mechanism.json
34028457bfd675066d61f029698dfe32360e7b10 data/create/recipes/sequenced_assembly/track.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2024-11-07T10:32:15.786804 Create's Advancements
// 1.19.2 2024-11-07T10:40:17.188837 Create's Advancements
1aa4a19d97df326b9e4819bc72290524ea094b88 data/create/advancements/arm_blaze_burner.json
7f968a34d7c81ce222166fc00386cbfbbdfd2413 data/create/advancements/glass_pipe.json
82174d713d926d2cbb20fabe9f0e326758d74804 data/create/advancements/mechanical_press.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2024-11-07T10:32:15.786591 Create's Mechanical Crafting Recipes
// 1.19.2 2024-11-07T10:40:17.226099 Create's Mechanical Crafting Recipes
75ed217b219788ede2145726272f0ab2bb747edc data/create/recipes/mechanical_crafting/crushing_wheel.json
b24b97d694f24fa366e5e559af45ec8c5ade90ae data/create/recipes/mechanical_crafting/potato_cannon.json
d2cc0e77f2d9864d6aa373e7be7ac83ef9bf357a data/create/recipes/mechanical_crafting/wand_of_symmetry.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2024-11-07T10:32:15.782586 Create's Standard Recipes
// 1.19.2 2024-11-07T10:40:17.233333 Create's Standard Recipes
65223af27cbbd3b41579cdcd00300e16295fb1f4 data/create/recipes/crafting/kinetics/brass_hand.json
dcf0c572da4e7778898a95e94dbf679f54245225 data/create/advancements/recipes/create.base/crafting/logistics/powered_toggle_latch.json
10411c8e682fa61ea72e5e8b363b476a7dce1506 data/create/recipes/crafting/appliances/filter_clear.json
Expand All @@ -22,7 +22,7 @@ bee122e41d30ebaca7f773063b41a8cef3568b52 data/create/advancements/recipes/buildi
d6b68a6fb4b7872f800585a8616cfe1ff1a0428c data/create/recipes/blasting/copper_ingot_from_crushed.json
d8d9226fa3e395fabca7f62f2477379e9e1be50f data/create/recipes/crafting/kinetics/item_drain.json
9402ffe97f6f2154896a367e614e61c604def8b8 data/create/recipes/crafting/kinetics/adjustable_chain_gearshift.json
8234f7429962361a3682733394614e2da00f4e00 data/create/recipes/blasting/zinc_ingot_from_raw_ore.json
82219f938d33b1d66f517ee23576c53b94c36e83 data/create/recipes/blasting/zinc_ingot_from_raw_ore.json
9c5b43b4baf131e287fd34c17ea93ce5315da4f3 data/create/recipes/crafting/kinetics/wrench.json
db9a084a72910c93dcac4df833b66ff2b917071e data/create/advancements/recipes/building_blocks/blasting/tin_ingot_compat_techreborn.json
142aff3d898c4cec5e2dae9da30907011d865ff4 data/create/recipes/smelting/ingot_aluminium_compat_ic2.json
Expand Down Expand Up @@ -93,7 +93,7 @@ b156e8f54547f6272c9606d5c3b2d482ffc3cb55 data/create/recipes/smelting/platinum_i
baaabf43821cb3c61ed2bf8a2431ee5ac108c923 data/create/recipes/crafting/kinetics/track_signal.json
d78395b4352d6df560d39e8edbc006fd389d18b5 data/create/recipes/crafting/logistics/redstone_link.json
051e9a912e57dcbe12f8a711e54ed8e498bd1d93 data/create/recipes/crafting/kinetics/turntable.json
cab0e5685f36e0bc0b98e53253ebf08e615b8885 data/create/recipes/smelting/zinc_ingot_from_raw_ore.json
ed514c713c261273d47a45078b9d0b9aa2c6e2ca data/create/recipes/smelting/zinc_ingot_from_raw_ore.json
1117899dfc50804579d7b40e0fc441b7e522cb12 data/create/recipes/crafting/kinetics/smart_fluid_pipe.json
ac8519dc87331facee57802dad374c0b32b8bf0c data/create/recipes/smelting/glass_pane_from_tiled_glass_pane.json
3e407ded7ff0dde48cbc22b8db5f48743bf04c94 data/create/advancements/recipes/create.base/crafting/kinetics/shaft.json
Expand Down Expand Up @@ -307,7 +307,7 @@ f965e0bfde1a0960e009c1bf4daa4ef8704c7ada data/create/advancements/recipes/create
31faf602c6bc1e695e6d654dfeb5a55fbdc8e6e3 data/create/recipes/crafting/kinetics/controller_rail.json
9678042d96351f38df2dd538181c711b7319ac4e data/create/advancements/recipes/create.base/crafting/appliances/attribute_filter_clear.json
0b4fd2cf9ab5d50e2d1f3466e471dc8599cb35d6 data/create/advancements/recipes/create.base/crafting/curiosities/minecart_coupling.json
edff7ed60a3f094a20dbe7b18379722db127a28a data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_raw_ore.json
ce3d31af33754ea72abb814d90827430b8e6ae5d data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_raw_ore.json
babadcfb9adc3527e03e8f8db57a34cacfffa6a5 data/create/advancements/recipes/create.base/crafting/kinetics/vertical_gearboxfrom_conversion.json
fa379bdc26064fafff3ccb84e705cdca532e9044 data/create/advancements/recipes/create.base/crafting/kinetics/gantry_carriage.json
c9834e76909bd803f6d8faa5badb4051cd1f4c46 data/create/advancements/recipes/create.base/crafting/kinetics/mechanical_mixer.json
Expand Down Expand Up @@ -359,7 +359,7 @@ a72ce82d24d3ece67350ae508cb3e24616d7e09d data/create/advancements/recipes/buildi
9135b75ab7c1b34889d11b1b29faec91712b4c73 data/create/recipes/crafting/kinetics/large_water_wheel.json
4f541c22efef5ed3131364cf0609c7fced8f157c data/create/advancements/recipes/create.base/crafting/appliances/schedule_clear.json
e6bfe9d4b015546d970f5ece35c08a642f9167b6 data/create/recipes/crafting/appliances/linked_controller.json
48d44e2db17e47c35365048ae71207afef50f0b9 data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_raw_ore.json
d7063beabc40e0ddec5673f434f054b8d5c2b949 data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_raw_ore.json
fe68fed5b2d3081cb3b90d11e67caa30bfefcdf5 data/create/recipes/crafting/kinetics/linear_chassis.json
81fa6d58358e053ca974d1fcc7fc5b0886370e83 data/create/recipes/crafting/logistics/andesite_funnel.json
c21b460daa90c823459f6a3bdb08bc0e110164f7 data/create/recipes/crafting/kinetics/attribute_filter.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2024-11-07T10:32:15.749981 Registrate Provider for create [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
// 1.19.2 2024-11-07T10:40:17.19209 Registrate Provider for create [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
9e847f017cfff4c2c60359590d018470cfe66e18 assets/create/models/block/crimson_window_pane_post.json
ba7a9f542e9f65bdce3d3330a95f1166a0be0673 assets/create/models/item/tree_fertilizer.json
4b9f96c0171731bee73512314f7c5d18552601ab data/create/advancements/recipes/create.palettes/crafting/kinetics/lime_seat_from_other_seat.json
Expand Down Expand Up @@ -1488,7 +1488,6 @@ c7155f56b7d31f5f8f6bb284fb71b39019d967a1 data/create/advancements/recipes/create
ea74bb8a69f6acbd520ac8922e147495e5f99f6f assets/create/models/block/cut_tuff_slab_top.json
716fc6ef58c240b3e6b45acf08d6e1472fe38e7c assets/create/models/block/cut_scorchia_brick_slab_top.json
dadc7b65a4527e288c21a20df978796a8c444fd2 assets/create/models/item/waxed_weathered_copper_tile_stairs.json
71174ad3f47e445d81b788d4f4dfad8c127142ab data/c/tags/items/raw_materials.json
04ebbdd14f81f4b4dc7986cb5241caa9f48f4ff1 data/create/recipes/small_ochrum_brick_stairs_from_stone_types_ochrum_stonecutting.json
59e82c94d2492454309e487a4d263a9839bcc7fe data/c/tags/items/colorless_glass.json
8fb838ee0868f371eb538f98ffeeaa6d0cfa5f0c assets/create/models/item/gantry_shaft.json
Expand Down Expand Up @@ -1891,6 +1890,7 @@ ed767ec42c339081d393eafcc4d91c71cd292ae3 data/create/recipes/crafting/kinetics/y
c93f33ba39c62b10dfb94c6e1c339cd4fbebffae assets/create/models/block/cut_limestone_brick_slab.json
2208507d99a47df8bbdc0e2e34ab1d7f94ccd893 data/create/loot_tables/blocks/brown_toolbox.json
1ba48c5cae05b6f4b1ad223ce80925f1eaaf5dfd data/create/recipes/small_veridium_brick_wall_from_stone_types_veridium_stonecutting.json
71174ad3f47e445d81b788d4f4dfad8c127142ab data/c/tags/items/raw_zinc_ores.json
8426a494b776148056cb4525e62744d0be8b28cd data/create/recipes/cut_calcite_slab_from_stone_types_calcite_stonecutting.json
b3aba4c82062407557d4724d8eae5192f093b132 data/create/recipes/polished_cut_dripstone_slab_from_stone_types_dripstone_stonecutting.json
4aa1c72bd9cc0421006e0a3c568b4a1176411ed3 data/create/loot_tables/blocks/small_veridium_brick_stairs.json
Expand Down Expand Up @@ -2874,6 +2874,7 @@ f9e23ff774f537a06b4c7909c36d92b2163300b2 data/create/loot_tables/blocks/haunted_
c046436d59c350c6beb6b395675513c12184ffe2 assets/create/models/block/cut_deepslate_bricks_wall_side_tall.json
49a17610b5b05595894ca2683056cecd724c1111 assets/create/models/item/small_diorite_brick_stairs.json
0d75b2cdf2ee0ca9366b26c1f7042bb9b3e3753c assets/create/models/item/polished_cut_crimsite.json
71174ad3f47e445d81b788d4f4dfad8c127142ab data/c/tags/items/raw_ores.json
b8cb1b04eb869a06ded04c4c3acac6e5a315ee78 assets/create/models/item/cut_dripstone_brick_stairs.json
792f95d68c501bc0c2d5f1add2faa0cf36b124a2 assets/create/models/block/layered_crimsite.json
50b550dd3d2e48173c6124de445e9370590fe1f1 data/create/advancements/recipes/create.palettes/polished_cut_scoria_slab.json
Expand Down Expand Up @@ -4277,7 +4278,6 @@ c78e2acf9b54d7370f12e34dcca5c71743f47d55 assets/create/models/block/cut_andesite
278a2c97bf0add278ade05881b61023936e01405 data/create/loot_tables/blocks/cut_scorchia_brick_slab.json
7008c5576e1a180ef8b1851e5831b5c1bc003ead data/create/tags/entity_types/blaze_burner_capturable.json
816a66c69beaf91eb676d33576586aaee8fbf802 data/create/tags/blocks/ore_override_stone.json
71174ad3f47e445d81b788d4f4dfad8c127142ab data/c/tags/items/raw_materials/zinc.json
8d334e026e94b304a1ff1ee96097f434b50175f2 assets/create/blockstates/cut_ochrum_brick_stairs.json
972681c4ca6a31eb017d51c2d951b99b3518cb73 data/create/recipes/diorite_from_stone_types_diorite_stonecutting.json
6ba16971a01a083ae7f246469caa9712513035b2 data/create/recipes/cut_diorite_wall.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2024-11-07T10:32:15.674734 Create's Processing Recipes
// 1.19.2 2024-11-07T10:40:17.226349 Create's Processing Recipes
6fa162b311d9323d8383dd45239786482cc8c699 data/create/recipes/cutting/compat/byg/imparius_hyphae.json
8d2f92db0e107b4c82fdb5fcfc5c0f5a23fbd852 data/create/recipes/milling/compat/biomesoplenty/orange_cosmos.json
47a860aaf489792d7ec7bfc77d0fb020886c92cd data/create/recipes/haunting/soul_lantern.json
Expand Down Expand Up @@ -338,7 +338,7 @@ bd33a879dc55a153c9aa4d4e3a62befb7b58c6d7 data/create/recipes/cutting/compat/byg/
587e32e62f2d4c527bdb6ce748d57bbd307bafbd data/create/recipes/cutting/compat/projectvibrantjourneys/baobab_log.json
7244424b8f74e71d65b130486f3c6764774a7819 data/create/recipes/cutting/compat/byg/cherry_wood.json
46d133587dd3b6cef94559e6d712846295555cfc data/create/recipes/cutting/compat/atmospheric/stripped_kousa_log.json
220b41888887f28d06a714803806603378b8d1e8 data/create/recipes/crushing/raw_zinc.json
709c80932174641ffd404ab65b04e03054e7ccb5 data/create/recipes/crushing/raw_zinc.json
f96373d7246fc09c49ca1082ba8b0da7d703bb60 data/create/recipes/pressing/compat/infernalexp/warped_nylium_path.json
f863ed59c82ac2456afd93788f041378d88358bc data/create/recipes/milling/compat/byg/orange_amaranth.json
fcb01ec2d0b29e94472232b5364996716b97ea08 data/create/recipes/cutting/compat/biomesoplenty/stripped_cherry_log.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.19.2 2024-11-07T10:32:15.782035 Create's Custom Sounds
// 1.19.2 2024-11-07T10:40:17.236864 Create's Custom Sounds
bcfd9320f8ed54f3282b1757a41da0d1753e1754 assets/create/sounds.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.19.2 2024-11-07T10:32:15.673798 Create's Recipe Serializer Tags
// 1.19.2 2024-11-07T10:40:17.225081 Create's Recipe Serializer Tags
976b8a4cf8342e0e8a747ceeba448634f549fc9a data/create/tags/recipe_serializer/automation_ignore.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"conditions": {
"items": [
{
"tag": "c:raw_materials/zinc"
"tag": "c:raw_zinc_ores"
}
]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"conditions": {
"items": [
{
"tag": "c:raw_materials/zinc"
"tag": "c:raw_zinc_ores"
}
]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"cookingtime": 100,
"experience": 0.7,
"ingredient": {
"tag": "c:raw_materials/zinc"
"tag": "c:raw_zinc_ores"
},
"result": "create:zinc_ingot"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"type": "create:crushing",
"ingredients": [
{
"tag": "c:raw_materials/zinc"
"tag": "c:raw_zinc_ores"
}
],
"processingTime": 400,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"cookingtime": 200,
"experience": 0.7,
"ingredient": {
"tag": "c:raw_materials/zinc"
"tag": "c:raw_zinc_ores"
},
"result": "create:zinc_ingot"
}
2 changes: 1 addition & 1 deletion src/main/java/com/simibubi/create/AllItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public class AllItems {
.register();

public static final ItemEntry<Item> RAW_ZINC =
taggedIngredient("raw_zinc", forgeItemTag("raw_materials/zinc"), TagKey.create(Registry.ITEM_REGISTRY, new ResourceLocation("c", "raw_materials")));
taggedIngredient("raw_zinc", forgeItemTag("raw_zinc_ores"), TagKey.create(Registry.ITEM_REGISTRY, new ResourceLocation("c", "raw_ores")));

public static final ItemEntry<Item> ANDESITE_ALLOY = taggedIngredient("andesite_alloy", CREATE_INGOTS.tag),
ZINC_INGOT = taggedIngredient("zinc_ingot", forgeItemTag("zinc_ingots"), CREATE_INGOTS.tag),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public class CrushingRecipeGen extends ProcessingRecipeGen {
RAW_IRON_ORE = rawOre("iron", () -> Tags.Items.RAW_MATERIALS_IRON, AllItems.CRUSHED_IRON::get, 1),
RAW_COPPER_ORE = rawOre("copper", () -> Tags.Items.RAW_MATERIALS_COPPER, AllItems.CRUSHED_COPPER::get, 1),
RAW_GOLD_ORE = rawOre("gold", () -> Tags.Items.RAW_MATERIALS_GOLD, AllItems.CRUSHED_GOLD::get, 2),
RAW_ZINC_ORE = rawOre("zinc", () -> AllTags.forgeItemTag("raw_materials/zinc"), AllItems.CRUSHED_ZINC::get, 1),
RAW_ZINC_ORE = rawOre("zinc", () -> AllTags.forgeItemTag("raw_zinc_ores"), AllItems.CRUSHED_ZINC::get, 1),

OSMIUM_RAW_ORE = moddedRawOre(OSMIUM, AllItems.CRUSHED_OSMIUM::get),
PLATINUM_RAW_ORE = moddedRawOre(PLATINUM, AllItems.CRUSHED_PLATINUM::get),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1171,7 +1171,7 @@ public class StandardRecipeGen extends CreateRecipeProvider {
.inBlastFurnace(),

RAW_ZINC_ORE = create(AllItems.ZINC_INGOT::get).withSuffix("_from_raw_ore")
.viaCookingTag(() -> AllTags.forgeItemTag("raw_materials/zinc"))
.viaCookingTag(() -> AllTags.forgeItemTag("raw_zinc_ores"))
.rewardXP(.7f)
.inBlastFurnace(),

Expand Down

0 comments on commit 9981084

Please sign in to comment.